Skip to content

Teach gather_port_vars about subpackages #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
kprovost wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Teach gather_port_vars about subpackages #1222

kprovost wants to merge 1 commit into from
+6 −2

Conversation

@kprovost
Copy link

@kprovost kprovost commented Apr 29, 2025

List subpackages in addition to the parent package if the origin specifies a subpackage.

This fixes pkgclean, which would otherwise remove subpackages even if they're explicitly listed in the to-keep file.

@kprovost
Teach gather_port_vars about subpackages
03cf990 
List subpackages rather than the parent package if the origin specifies a subpackage.

This fixes pkgclean, which would otherwise remove subpackages even if they're
explicitly listed in the to-keep file.
@bdrewery
Copy link
Member

bdrewery commented Apr 30, 2025

Did you run the test suite? make -j2 check

@bdrewery bdrewery self-assigned this Apr 30, 2025
@kprovost
Copy link
Author

kprovost commented Apr 30, 2025

The test suite produces a number of failures for me, even without this patch.
With it there's one extra failure in pkgqueue_basic.sh:

[00:00:00] (00:00:00) stderr: HAVE:
[00:00:00] (00:00:00) stderr:      1    build:pkg build:bash$
[00:00:00] (00:00:00) stderr:      2    build:pkg build:patchutils$
[00:00:00] (00:00:00) stderr:      3    build:bash build:patchutils$
[00:00:00] (00:00:00) stderr: EXPECTED:
[00:00:00] (00:00:00) stderr:      1    build:pkg build:bash$
[00:00:00] (00:00:00) stderr:      2    build:bash build:patchutils$
[00:00:00] (00:00:00) stderr:      3    build:pkg build:patchutils$
[00:00:00] (00:00:00) stderr: --- /tmp/poudriere/test/tmp.AZ2Qyrk92K/assert_file.expected.99cK4Hgl8p^I2025-04-30 15:41:14.905710000 +0200$
[00:00:00] (00:00:00) stderr: +++ /tmp/poudriere/test/tmp.AZ2Qyrk92K/assert_out.gyxyAzwHY7^I2025-04-30 15:41:14.897019000 +0200$
[00:00:00] (00:00:00) stderr: @@ -1,3 +1,3 @@$
[00:00:00] (00:00:00) stderr:  build:pkg build:bash$
[00:00:00] (00:00:00) stderr: -build:bash build:patchutils$
[00:00:00] (00:00:00) stderr:  build:pkg build:patchutils$
[00:00:00] (00:00:00) stderr: +build:bash build:patchutils$
[00:00:00] (00:00:00) stderr: =>> Cleaning up

It's not clear to me if that's a real problem or just a flaky test. I'd certainly not expect my patch to re-order things, at least not as long as no sub packages are involved.

@bdrewery
Copy link
Member

bdrewery commented Apr 30, 2025

Which commit hash are you testing on?

@kprovost
Copy link
Author

kprovost commented Apr 30, 2025

b3127a3

@kprovost
Copy link
Author

kprovost commented May 27, 2025

Is there anything I can/need to do to push this forward?

@bdrewery
Copy link
Member

bdrewery commented May 27, 2025

I need to find time to integrate it with extra tests I have for subpackages. I'm sure this fixes something, but it's a complex feature. As is incremental is completely broken with subpackages. So I am cautious about introducing more change to it. I'll try to find time in the next few weeks to bring in your PR.

@brd
Copy link
Member

brd commented Oct 13, 2025

Do you have the extra tests in a branch somewhere?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@bdrewery bdrewery

Labels

subpackages

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kprovost @bdrewery @brd